gdk: Remove gdkinternals.h

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 9c4f941195ba0a3e87b2516f1c5f839d39b21df4..cd8c0bdcc8f0e007757daa5a49d61e78809c9253 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -26,18 +26,13 @@
 
 #include "gdkversionmacros.h"
 
-#include "gdkinternals.h"
-#include "gdkintl.h"
-
 #include "gdkresources.h"
 
-#include "gdk-private.h"
-
 #include "gdkconstructor.h"
-
-#ifndef HAVE_XCONVERTCASE
-#include "gdkkeysyms.h"
-#endif
+#include "gdkdebug.h"
+#include "gdkdisplay.h"
+#include "gdkintl.h"
+#include "gdk-private.h"
 
 #include <string.h>
 #include <stdlib.h>

diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index d728fec56fe076ce10ef09b4a9d96c01c4835a75..ef8f5d2fb5901e25d5219d1b673542fdbdcffc81 100644 (file)
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -17,9 +17,7 @@
 
 #include "config.h"
 
-#include "gdkcairo.h"
-
-#include "gdkinternals.h"
+#include "gdkcairoprivate.h"
 
 #include <math.h>
 

diff --git a/gdk/gdkcairocontext.c b/gdk/gdkcairocontext.c
index 8f611eeef4ec75d63e02f556281096cda2aea19f..fb54bbeab7cdd126c6cdc05e6e94a70fbd27bfcf 100644 (file)
--- a/gdk/gdkcairocontext.c
+++ b/gdk/gdkcairocontext.c
@@ -25,7 +25,6 @@
 #include "gdkcairocontextprivate.h"
 
 #include "gdkcairo.h"
-#include "gdkinternals.h"
 
 /**
  * GdkCairoContext:

diff --git a/gdk/gdkcairoprivate.h b/gdk/gdkcairoprivate.h
index 2d1f22d11c86696af3da74e2f160e0db5f47d59b..654dec25fa419ae9bfe974a694707f339b11c142 100644 (file)
--- a/gdk/gdkcairoprivate.h
+++ b/gdk/gdkcairoprivate.h
@@ -18,6 +18,8 @@
 #ifndef __GDK_CAIRO_PRIVATE_H__
 #define __GDK_CAIRO_PRIVATE_H__
 
+#include "gdkcairo.h"
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cairo.h>
 

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 3534eee8084d14cf2befefee2acd1c997f5fe37d..e3aea8e653325aec584e54730683ac980edf4a09 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -31,7 +31,6 @@
 #include "gdkcursorprivate.h"
 #include "gdktexture.h"
 #include "gdkintl.h"
-#include "gdkinternals.h"
 
 #include <math.h>
 #include <errno.h>

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 3869b6d9bcb71128becfbdde29c3ba428e54d562..9f69b189d5f9b9bc81a6ae2349532a15b27d15ec 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -22,7 +22,6 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetool.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkkeysprivate.h"
 

diff --git a/gdk/gdkdevicetool.c b/gdk/gdkdevicetool.c
index b866d50e15f578269938ae4dfa81c59bc16a53da..1a75e5cdfa5f2d6a6887b04366a1c62987c2071b 100644 (file)
--- a/gdk/gdkdevicetool.c
+++ b/gdk/gdkdevicetool.c
@@ -20,7 +20,7 @@
 #include <math.h>
 
 #include "gdkdevicetoolprivate.h"
-#include "gdkinternals.h"
+#include "gdkenumtypes.h"
 #include "gdkintl.h"
 
 /**

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 6916cc0e34e883665a94c1365937047fd8eed12e..71d47f1d309e4f3d0289e5530258820963bb36b6 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -31,13 +31,12 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkevents.h"
-#include "gdkinternals.h"
-#include "gdkmonitorprivate.h"
 #include "gdkframeclockidleprivate.h"
+#include "gdkeventsprivate.h"
+#include "gdkglcontextprivate.h"
+#include "gdkmonitorprivate.h"
 
 #include <math.h>
-#include <glib.h>
 
 /**
  * GdkDisplay:

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 557444ff1c46ca7393dcf54673d1e9899b12fe87..cbd03b77686a7c4f435f9e6741b0f8cf225925ee 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -27,7 +27,6 @@
 #include "gdkconfig.h"
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkkeysprivate.h"
 #include "gdkintl.h"
 

diff --git a/gdk/gdkdrawcontext.c b/gdk/gdkdrawcontext.c
index d1c5cd09600ba3b474349fdb2dcb5075414a0516..fdd6fc9c9d9bc4521e40388eeca21165ccc4fb1a 100644 (file)
--- a/gdk/gdkdrawcontext.c
+++ b/gdk/gdkdrawcontext.c
@@ -22,9 +22,9 @@
 
 #include "gdkdrawcontextprivate.h"
 
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkprofilerprivate.h"
+#include "gdksurfaceprivate.h"
 
 /**
  * GdkDrawContext:

diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index fc70822cb077bcba415b5c4508ff56b20ad768c2..ff3efbaa4e4b29fe67c53aeb25d178efb4f99bbc 100644 (file)
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -46,9 +46,9 @@
 #include "gdkcontentserializer.h"
 #include "gdkcursor.h"
 #include "gdkdisplay.h"
+#include "gdkdragprivate.h"
 #include "gdkenumtypes.h"
 #include "gdkeventsprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkpipeiostreamprivate.h"
 #include "gdksurface.h"

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index fcfeda6f9603885663cd2040c38da91b8b64837e..3ee8905ef3b2b965921c57ddda3dadb29561924d 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -28,7 +28,6 @@
 #include "gdkdragprivate.h"
 #include "gdkdropprivate.h"
 #include "gdkeventsprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"

diff --git a/gdk/gdkframeclock.c b/gdk/gdkframeclock.c
index 6f75e13620554a3cc4403a1acbda3516824fafb5..dccf5ffcb140c329878bee7470f0722c4e04f2b1 100644 (file)
--- a/gdk/gdkframeclock.c
+++ b/gdk/gdkframeclock.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkframeclockprivate.h"
-#include "gdkinternals.h"
 
 /**
  * GdkFrameClock:

diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c
index 363cf6bd5572c073e6a1ff5e4c24203ff9d2d850..10c4e5cd2a09a3acfc4ad020ff37f7a57b2a64bb 100644 (file)
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -26,7 +26,7 @@
 
 #include "gdkframeclockidleprivate.h"
 
-#include "gdkinternals.h"
+#include "gdkdebug.h"
 #include "gdkframeclockprivate.h"
 #include "gdk-private.h"
 #include "gdkprofilerprivate.h"

diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
index 417c29d15bce4bfa605ee0fc615ca5d601f01722..c6a73a7071e66fcc5092774522aaa8fb6d322cb2 100644 (file)
--- a/gdk/gdkgl.c
+++ b/gdk/gdkgl.c
@@ -18,9 +18,9 @@
 #include "config.h"
 
 #include "gdkcairo.h"
-#include "gdkglcontextprivate.h"
 
-#include "gdkinternals.h"
+#include "gdkglcontextprivate.h"
+#include "gdksurfaceprivate.h"
 
 #include <epoxy/gl.h>
 #include <math.h>

diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 9f8673627f40ee964927386d36a9a1f0b68098b1..a692a4f5ef62009820ff23ede1df6e318986be05 100644 (file)
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -78,7 +78,6 @@
 
 #include "gdkdebug.h"
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkmemorytextureprivate.h"
 

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 22b4cf0f448a32ad4c6103fd553d8b5ac6478e19..ebbe6a9c398fb006eb00a1f1cf6c90be6e97eada 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdktypes.h"
-#include "gdkinternals.h"
 
 #include <stdio.h>
 

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
deleted file mode 100644 (file)
index d3559e4..0000000
--- a/gdk/gdkinternals.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-/* Uninstalled header defining types and functions internal to GDK */
-
-#ifndef __GDK_INTERNALS_H__
-#define __GDK_INTERNALS_H__
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gdkenumtypes.h"
-#include "gdkeventsprivate.h"
-#include "gdksurfaceprivate.h"
-#include "gdkdragprivate.h"
-#include "gdkkeysprivate.h"
-#include "gdkdeviceprivate.h"
-#include "gdkseatprivate.h"
-#include "gdkdisplayprivate.h"
-#include "gdkcairoprivate.h"
-#include "gdkglcontextprivate.h"
-#include "gdkdebug.h"
-
-#endif /* __GDK_INTERNALS_H__ */

diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index 2672d9b83be474bb896752bfd3f608d1e83176f8..7600f4fc6132558041731a1bd10fd913f6671188 100644 (file)
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkkeysyms.h"
-#include "gdkinternals.h"
 
 /* Key handling not part of the keymap */
 

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index e649236faaff2c5daaec35852c43d791f088070f..8cf98feeafadf958b447fd90613ac9cbcc418587 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -25,7 +25,6 @@
 #include "gdkpixbuf.h"
 
 #include "gdksurface.h"
-#include "gdkinternals.h"
 #include "gdktextureprivate.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>

diff --git a/gdk/gdkseat.c b/gdk/gdkseat.c
index 80abf8eeec0bc668d070cea957b49cc781e0ffd1..cb09602eaa8dab6bd814530a7aa84f3b990e311f 100644 (file)
--- a/gdk/gdkseat.c
+++ b/gdk/gdkseat.c
@@ -26,7 +26,6 @@
 #include "gdkseatprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkintl.h"
-#include "gdkinternals.h"
 
 /**
  * GdkSeat:

diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c
index 7e2c83ea93093f14fce4bc5faecc6338097c8543..ce47df8230e3f5c16a10ab0ee060f8e0f3aa6c83 100644 (file)
--- a/gdk/gdkseatdefault.c
+++ b/gdk/gdkseatdefault.c
@@ -19,7 +19,6 @@
 
 #include "gdkseatdefaultprivate.h"
 #include "gdkdevicetoolprivate.h"
-#include "gdkinternals.h"
 
 typedef struct _GdkSeatDefaultPrivate GdkSeatDefaultPrivate;
 

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 3f2b5189ffb751c06b859c8e70467b259429d61e..d2031eaf8f48faaf3d630b4da1ae1763b95ae8aa 100644 (file)
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -30,27 +30,24 @@
 #include "gdksurface.h"
 
 #include "gdk-private.h"
+#include "gdkcontentprovider.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdragsurfaceprivate.h"
 #include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
 #include "gdkglcontextprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkmarshalers.h"
 #include "gdkpopupprivate.h"
 #include "gdkrectangle.h"
 #include "gdktoplevelprivate.h"
+#include "gdkvulkancontext.h"
 
 #include <math.h>
 
 #include <epoxy/gl.h>
 
-#ifdef GDK_WINDOWING_WAYLAND
-#include "wayland/gdkwayland.h"
-#endif
-
 /**
  * GdkSurface:
  *

diff --git a/gdk/gdktexture.c b/gdk/gdktexture.c
index e04adfbb33127e046a481b8017e8279c1ccd97cc..b79b671a5308763351753b3036f62a920f0d759d 100644 (file)
--- a/gdk/gdktexture.c
+++ b/gdk/gdktexture.c
@@ -40,7 +40,6 @@
 
 #include "gdktextureprivate.h"
 
-#include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkpaintable.h"

diff --git a/gdk/gdkvulkancontext.c b/gdk/gdkvulkancontext.c
index 39cb955ce09be4d459d3674d45cf7ff5f3d007a0..c3f54bbb7c69ded462ec6fed502c4fd42da6cc92 100644 (file)
--- a/gdk/gdkvulkancontext.c
+++ b/gdk/gdkvulkancontext.c
@@ -25,7 +25,6 @@
 #include "gdkvulkancontextprivate.h"
 
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 /**

diff --git a/gdk/gdkvulkancontextprivate.h b/gdk/gdkvulkancontextprivate.h
index c543f9f997915ae1c557694fe94c3de7757873d8..45149789fcae7fbd1b46984a45b0fa4243d8c590 100644 (file)
--- a/gdk/gdkvulkancontextprivate.h
+++ b/gdk/gdkvulkancontextprivate.h
@@ -23,8 +23,8 @@
 
 #include "gdkvulkancontext.h"
 
+#include "gdkdebug.h"
 #include "gdkdrawcontextprivate.h"
-#include "gdkinternals.h"
 
 #ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>

diff --git a/gtk/inspector/logs.c b/gtk/inspector/logs.c
index b8f22b950471c69e21ab6cde15d4216afe012f78..79f0f7e904c9d0de346983dd1039abb2e4a95c01 100644 (file)
--- a/gtk/inspector/logs.c
+++ b/gtk/inspector/logs.c
@@ -36,12 +36,12 @@
 #include "gtkprivate.h"
 #include "gtkroot.h"
 #include "gtkdebug.h"
-#include "gdkinternals.h"
 #include "gtknative.h"
 #include "gskdebugprivate.h"
 #include "gskrendererprivate.h"
 #include "gtkboxlayout.h"
 
+#include "gdk/gdkdebug.h"
 
 struct _GtkInspectorLogs
 {